From 4e92c9cd0ff6121fc3efc8b2ba248476e3208907 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 30 Nov 2005 12:51:24 +0100 Subject: [PATCH] Remove some vmx header files from Xen public interfaces. They are not public. Signed-off-by: Keir Fraser --- xen/arch/x86/dm/i8259.c | 2 +- xen/arch/x86/dm/vmx_vioapic.c | 2 +- xen/arch/x86/vmx.c | 4 +- xen/arch/x86/vmx_intercept.c | 2 +- xen/arch/x86/vmx_io.c | 5 +- xen/include/asm-x86/vmx_platform.h | 4 +- xen/include/{public/io => asm-x86}/vmx_vpic.h | 0 .../asm-x86/{vmx_virpit.h => vmx_vpit.h} | 2 +- xen/include/public/io/vmx_vlapic.h | 58 ------------------- 9 files changed, 10 insertions(+), 69 deletions(-) rename xen/include/{public/io => asm-x86}/vmx_vpic.h (100%) rename xen/include/asm-x86/{vmx_virpit.h => vmx_vpit.h} (97%) delete mode 100644 xen/include/public/io/vmx_vlapic.h diff --git a/xen/arch/x86/dm/i8259.c b/xen/arch/x86/dm/i8259.c index 3e7b191d34..c0d735dc52 100644 --- a/xen/arch/x86/dm/i8259.c +++ b/xen/arch/x86/dm/i8259.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/xen/arch/x86/dm/vmx_vioapic.c b/xen/arch/x86/dm/vmx_vioapic.c index b955575e5e..b97a9b4bc2 100644 --- a/xen/arch/x86/dm/vmx_vioapic.c +++ b/xen/arch/x86/dm/vmx_vioapic.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include static void ioapic_enable(vmx_vioapic_t *s, uint8_t enable) diff --git a/xen/arch/x86/vmx.c b/xen/arch/x86/vmx.c index 7ae4f612b6..b4878317a0 100644 --- a/xen/arch/x86/vmx.c +++ b/xen/arch/x86/vmx.c @@ -43,8 +43,8 @@ #endif #include #include -#include -#include +#include +#include int hvm_enabled; diff --git a/xen/arch/x86/vmx_intercept.c b/xen/arch/x86/vmx_intercept.c index a7d49cd573..67029c2c95 100644 --- a/xen/arch/x86/vmx_intercept.c +++ b/xen/arch/x86/vmx_intercept.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/xen/arch/x86/vmx_io.c b/xen/arch/x86/vmx_io.c index 7cbdafb277..5557e03474 100644 --- a/xen/arch/x86/vmx_io.c +++ b/xen/arch/x86/vmx_io.c @@ -32,13 +32,12 @@ #include #include #include -#include +#include #include #include - +#include #include #include -#include #ifdef CONFIG_VMX #if defined (__i386__) diff --git a/xen/include/asm-x86/vmx_platform.h b/xen/include/asm-x86/vmx_platform.h index 3e7563fe5c..636fbd9942 100644 --- a/xen/include/asm-x86/vmx_platform.h +++ b/xen/include/asm-x86/vmx_platform.h @@ -22,10 +22,10 @@ #include #include -#include +#include #include #include -#include +#include #define MAX_OPERAND_NUM 2 diff --git a/xen/include/public/io/vmx_vpic.h b/xen/include/asm-x86/vmx_vpic.h similarity index 100% rename from xen/include/public/io/vmx_vpic.h rename to xen/include/asm-x86/vmx_vpic.h diff --git a/xen/include/asm-x86/vmx_virpit.h b/xen/include/asm-x86/vmx_vpit.h similarity index 97% rename from xen/include/asm-x86/vmx_virpit.h rename to xen/include/asm-x86/vmx_vpit.h index fad07a9847..e5fb1bc368 100644 --- a/xen/include/asm-x86/vmx_virpit.h +++ b/xen/include/asm-x86/vmx_vpit.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #define PIT_FREQ 1193181 diff --git a/xen/include/public/io/vmx_vlapic.h b/xen/include/public/io/vmx_vlapic.h deleted file mode 100644 index f63a9aaf16..0000000000 --- a/xen/include/public/io/vmx_vlapic.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef _VMX_VLAPIC_H -#define _VMX_VLAPIC_H - -/* - We extended one bit for PIC type - */ -#define VLAPIC_DELIV_MODE_FIXED 0x0 -#define VLAPIC_DELIV_MODE_LPRI 0x1 -#define VLAPIC_DELIV_MODE_SMI 0x2 -#define VLAPIC_DELIV_MODE_NMI 0x4 -#define VLAPIC_DELIV_MODE_INIT 0x5 -#define VLAPIC_DELIV_MODE_STARTUP 0x6 -#define VLAPIC_DELIV_MODE_EXT 0x7 -#define VLAPIC_DELIV_MODE_MASK 0x8 - -#define VLAPIC_MSG_LEVEL 4 - -#define INTR_EXT 0 -#define INTR_APIC 1 -#define INTR_LAPIC 2 - -#define VL_STATE_EOI 1 -#define VL_STATE_EXT_LOCK 2 -#define VL_STATE_MSG_LOCK 3 -#define VL_STATE_EOI_LOCK 3 - -#define VLOCAL_APIC_MAX_INTS 256 -#define VLAPIC_INT_COUNT (VLOCAL_APIC_MAX_INTS/(BITS_PER_BYTE * sizeof(uint64_t))) -#define VLAPIC_INT_COUNT_32 (VLOCAL_APIC_MAX_INTS/(BITS_PER_BYTE * sizeof(uint32_t))) - -typedef struct { - /* interrupt for PIC and ext type IOAPIC interrupt */ - uint64_t vl_ext_intr[VLAPIC_INT_COUNT]; - uint64_t vl_ext_intr_mask[VLAPIC_INT_COUNT]; - uint64_t vl_apic_intr[VLAPIC_INT_COUNT]; - uint64_t vl_apic_tmr[VLAPIC_INT_COUNT]; - uint64_t vl_eoi[VLAPIC_INT_COUNT]; - uint32_t vl_lapic_id; - uint32_t direct_intr; - uint32_t vl_apr; - uint32_t vl_logical_dest; - uint32_t vl_dest_format; - uint32_t vl_arb_id; - uint32_t vl_state; - uint32_t apic_msg_count; -} vlapic_info; - -#endif /* _VMX_VLAPIC_H_ */ - -/* - * Local variables: - * mode: C - * c-set-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ -- 2.30.2